Cleaning up some last get/sets to get ready for net implementation