some minor cleanups - including losing obsolete bug workaround defines