remove references to self.__path