some cleanups - still leaking a lot