Remove some pointless branches (#511)

* Remove some pointless branches

* this nonsense too

* this is unused
2 files changed