ixnay on anything but the vanillaest of the vanillas and that goes triple for bazzite and friends. you don't want "intriguing" shit left behind to take care of pops, that's a thing for you to play and experiment with.
your solution is already staring you in the face: the ubuntu you left behind persevered even under those circumstances. either fix it and update it or install a fresh one, with a tweak here and there. and don't touch nothing else..