New: Cleanup hooks added so that modules can clean up after themselves