Event Sink deletion corrected + refactoring

Signed-off-by: Lahiru Chandima <lahiruchandima@Lahirus-MacBook-Pro.local>