cleanup unused methods, comments