Deleted some obsolete code