Removed some unused fields. This commit shall be known as the mini-performance-branch-which-is-not-actually-a-branch.