removed some stuff that was accidentally added back in during latest big merge from refactor branch...