Bunch of cleanup.