Let's remove these instead of just commenting them out.