remove IDisposable and push cleanup into IoC container
Merge branch 'dev' into v4
typo