Final dirty diff cleanup