Doing a little cleanup.