Disabled optional form wizard steps by default, removed navigation debug shortcuts, added cleanup code to form submit