Corrected the code for routing and removed the some of unnecessary routes

Signed-off-by: Roshan <roshanbhgt@gmail.com>