More config changes.
Metrics fully cleaned up for new config.
Remove references to dead packages.