Issue #466- remove unneeded endpoints from routing