Getting rid of the ghost
Cleaning up