Clean-up of unused fields