getting rid of the other branch's junk