undo stuff I should not have committed