Merge "Clean up ArtClassDefinition"