removed old macro def
fixed some bad sources.  plugins are still confused