Revert "[New] refactored Locator"

This reverts commit bca42e35c897354516968412ec2d6aca5399a35c.
[Minor] Extended LocatorBuilder to allow removing last element