Comments, removal of unused methods