NOBUG mod_surveypro: still obsessive cleanup