Cleanup code, move tag IDs to TagRegistry