removed unused attributes and comments.