More cleanup, Specifications.