Remove usage of event namespace and add undelegate