Do a little cleanup