Done some cleanup.