smartswitch order form clean up