start clean-up - will have undo some of the changes here later on