Clean up helper redundancies