Cleanup, re-enabled CC addon.