removed obsolete stuff