Manager leak cleanup