removed some no-longer-used #defines (missed previously)
removed some no-longer-used #defines (missed previously)

tcurdt/feedbackreporter,seanm/feedbackreporter,tcurdt/feedbackreporter,seanm/feedbackreporter,tcurdt/feedbackreporter,seanm/feedbackreporter