sbrunot, I wonder if this is a safe change. If the removal of these classes would be really necessary, why it wouldn't be necessary on iOS? If on the contrary this removal proves to be unnecessary on all platforms, shouldn't we get rid of it completely (not only on iOS)? Is there any analysis that shows this is a safe change? Or it's just the testing which shows no harm due to this change, and doing it on iOS only is a way to minimize the risks? Please clarify.