Remove sauce option, clean up forms