Routes somes changes
Remove unused code
Some config typo correction