making some cleanup