Renamed Drain to Close