Remove some unneeded helper methods