cleanup and plugings