fixed cleanup of sinks