Done some cleanup