Improved sinkstop cleanup