Removing old event code