Removed the events code