cleanup of dependencies from common to core, first of many