trying to clean up diffs