Removed `ServiceLocatorAwareTrait`