Remove a couple more concrete class references