Cleanup after removing PathAwareElemApi