I think we should just remove these lines rather than commenting them out