remove a bit more of the gsupgrader stuff