Removed status checking code