Completely remove intid support and move uuid resolver to his own module