CFY--1196 remove unnecessary test
CFY-1196 remove unused import