clean up some dish code