Cleaned up IDisposable implementations