A few cleanups for files with changes promises