Rearrange wizard forms and validate that keywords for existing routers are actually new.
Remove superfluous method.