Removed some obsolete code.