Cleaning up comments, unused methods