[#81][s]: remove old submit form which we are no longer using.
[tests][xs]: fix minor bug re done being called in wrong place.