More deprecation clean up