Fixing Event Removal Error and COde Organisaton