Even more crazy cleanup