Removed obsolete check