Removed redundant attributes (cleanup)