CFY-557 more cleanup