Too much cleanup for one day...