Remove further unnecessary defensive measure