Did another big and scary cleanup