Half work (remove explicit registering) done now