Remove extra key check