More cleanup of specs