removed some obsolete stuff