Partial commit working on finalCleanup.