Modified `LocatorAwareInterface` and `LocatorAwareTrait` classes

Removed `getLocator` methods