Removed uneeded comments and methods