Killed some unused code
cleanup
removed a bunch of single line getters/setters