cleaned up routing interactions