Fix attribute removal for other entity types