General cleanup.
Remove a bunch of unneeded xml comments. Remove refereces to qt5 where qt6 can be used.