Removed obsolete property check