Remove event cleanup, it's causing too many issues.