Merge "Removed unused attribute"