What's the point in keeping that class, since we already breaking API?