Cleaning out unneeded helper methods