fixup! fixup! remove a lot of unused code