+1 post-RC code cleanup task. This is just a matter of personal habit, but we should definitely be consistent.