the last of the cleanup related changes?