Fix keywords
Remove bundled middleware