Lot more clean cleanup method