Cleaning up ..  cont