remove some cleanup