Removes old casts that became unnecessary by adding 'class' to I