got rid of more unneeded junctions