more obsolete code removed