first steps, removing some 6.0 legacy