This is most of the cleanup applied.