Added unmount popup and removed useless source