More cleanup, specs in Utils