Deleted some commented obsolete code