FORUM-543: Remove redundant attributes