Removed unused attribute
Code clean-up