Remove the factory fields