Remove has_key check