Remove unused attribute
WIP
WIP
WIP
WIP
WIP
WIP