Removed redundant classes and attribute.