Event:register cleanup, code consistency