Cleaning up comments and removing unused code