Removed some dead branches