Commented out unused fields