ci steps and a couple of cleanups