Remove useless class

I simplified the wrapper class so much that it's not required anymore
Merge branch 'hotfix/0.7.simplify'