Breaking eggs to make an omelette

Removed chunks of redundant code. It's 2am, this is a side "when I'm
bored" fixes.