Remove SouthboundMapper and SouthboundConstants dependencies