remove unnecessary fq class names
remove unused variable