made some cleanup