[2.1] Cleanup attributesFor