removed some (now) unnecessary code.