Removed did_check references