remove context.destination connection hack