MLDS-325 Remove usage fields