Removed some obsolete stuff.