Remove rewrite module
Merge branch 'hotfix/rewrite'