Remove HM Rewrite. Use separate submodule