Remvoe backward compatible avoidance for now