CFY-1377 start cleaning up
CFY-1377 start cleaning up