Remove zero length checks