Cleaned up events