More clean up (nearing the end)