Preparations for path cleanup