Add note about future removal (2.4? 3.x?)