File restructuring
attrRemove() func call removed