Remove unnecessary FQCN