Comment out unused fields