removed conflicting form fields