Remove more unused fields and methods