Cleanup impl