some additional
rm unused module&mapper
Merge pull request #65 from verdet23/master

Rm unused