Remove unregister call, not quite working, need to invest time in tests first
0.27.1