more obsolete code gone