Remove unused system advanced fields