Removing "set but not used" variables
Cleanup in defines, option parsing, regression handling (Phil's by default)