Finsihing cleaning up.