switch source to :path + cleanup