Removed unused helper functions