Added func to manually cleanup.
Minor cleanup.