More diff cleanup because I am blind