Rewrite eventrouter registration a bit more...
Cleanup