Removed unnecessary routing