- removed obsolete code