misc diff cleanup