Remove extra fields