Removed obsolete class references