[Feature Flag] Performance improvements for cleanup policies