fixup! Remove the hashmap for attributes.