Removed more unused code
Removed more unused code
Tightened up access on fields