adjust to odm event cleanup