Simplify loads of stuff and support 6.04.x without errors or warnings