Re-removing extraneous changes without deleting necessary code as well