Cleanup unused methods, comments