Fixed attribute name when saving user overrides
Removed unused code