Remove unnecessary block device checking