undo unneeded refactor