Cleaning up a few things from before.