Done some clean up.