Simplify custom fields slightly