Remove not needed FQNs