update fields description
remove unused macro