add mods for 31-cleanup