Cleanup definitions