- Cleanup of static functions