Removing unused code and comments