Removed unneeded import
Removed repeated code from an improper auto merge and renamed FormsES to FormES for consistency