Undo excess refactor