Removed dependencies to non-core assemblies