diff cleanup