Cleanup procedure missing some calls?

Printable View