#34 Merged the deregistration handlers into a single file