More code cleanup for "settle bills"