The "clean up immediately" logic is going away in the 2.2.8. It's caused nothing but trouble.
Edit: to be clear, it gets triggered only for devices' max state/event counts of 10 or less. Setting these values to 11 or more means hub will do regular hourly cleanup. Default values do not trigger this logic.