fix some cleanup mistakes