Tidying up some unused tooling