Remove unnecessary key check