Remove redundant middleware and update settings
Merge pull request #349 from jvc26/remove-middleware

Remove redundant middleware and update settings