Removed unused class_attribute, internal_uri