More ContentInterface cleanup stuff