<oneshot> Oneshot boolean is now set correctly.
Remove superfluous call to unregister