More cleanup! Added some notes to keep track of progress.