Remove unused attribute and type