Cleaning up code - removing other stuff