tap cleanup