More 0/1 cleanup