Another bunch of removed unused fields