Change routing
Remove Unnecessary params