Revert router integration due to wrong merge
Remove watcher from FormWizard component to avoid double beforeChange trigger Code cleanup