more cleanup
cleanup in helpers