removed more obsolete stuff