cleanup
more cleanup
more cleanup
CFY-1025 more cleanup