some obsolete code removed