Payment tool cleanup