remove commented out & crufty _submit_* calls