cleaned up uncalled routing