fix some cleanup