Remove unused code

- Remove a lot of unused code leftover from various refactorings.
- Remove a bunch of
x = y.map |z| {}
x
which should just be: y.map |z| {}