This doesn't complete the KF6 TODO yet though, the part about dropping the config file access is still pending.