Removing unnecessary use of FQCN