removed unused AttributeValidationObject and updated TODO