-Removed some obsolete code