Removing and uncommenting some code