Undo some unnecessary changes