Remove unneeded helper methods