removed some obsolete code.