Factored out a common Id for Core/Global. Removed some unused
depedendencies