Adding ability to remove events/code cleanup