More cleanup and distribution prep