More diff cleanup