Remove more unused fields