Removed obsolete code from Host