Remove ServiceLocatorAware