Remove obsolete forms fields
Fix export test