Just a bunch of cleanup.