Removed unnecessary checks from setUpFormSubmit
Added TODO