Cleanup and ICC Boss preparations