Remove unused methods, use snake_case