Finish cleanup. Compile and test suites work.