Cleaning up misplaced methods