CFY-1419 initial cleanup