Remove references to removed interfaces