Cleanup after a short delay to ensure close related events fire
Use cleanup instead of manual decoupling
Use cleanup helper to cleanup