why are the locatorHost/Port methods commented out? if they are going to be re-added later then a TODO in the comment could explain; if they are not needed, they should be deleted