Bug 982872 - Removed old events code