remove unused flag fields