deleted helpers and cleaned up routes