Cleanup, started test for unregistering, need to fix mono issues