Remove unused helper functions from main class