Remove use of non-standard fields