Added IDisposable cleanup