More cleanup of things we're not using any more