Removed unnecessary events dict