Simplify POI worker in preparation for move