more comparision cleanup