For ENG-6245, Remove uneccessary unused attribute flags