remove some routing logic to fix back button not working