Clean up
Add missing function