Removing unnecessary status check