CFY-1192 removed bernhard dependencies