Got rid of all the IDisposable nonsense