Undo last refactor