remove unused form field ids, debug output, blah