deleted more obsolete stuff