removed some obsolete code