The event removal is complete ... now for the modules and unit testing