More cleanup and major work