Removed some obsolete code