removing the deprecated v3.0 class references