Remove some unused fields and comments
Remove more unused fields, organize a bit