Remove unnecessary code
Fix routing