Removed redundant attributes and method