Removed non-core dependencies