removed some archaic code