Remove old submit handler mechanism and test