Remove some not needed FQNs