Finalizes the remove of global handler
Merge pull request #358 from typesafehub/wip/fix-removal-handler

Finalizes the remove of global handler