Cleanup some leftovers from the ml2 migration