Remove a few classes in favour of the IvToolkit classes.