Removed old rollup code and old event processing code