*8148* Validation/JS cleanup for submission