Removed Unused attributes