Removed CD checks.