removed some backwards compat. stuff.