Move conditions to navigation
Remove unused params