* removed some obsolete stuff.