Removing CommonServiceLocator - not needed!