OOIION-1342. Remove two unused computed attributes / REL 2.0