Disable one attributeRepository and fix duplicate comments