Done some clean up