Resolved conflicts from merge. Cleaned up commented out code in
validateForm().