Refactor
More refactoring
Celar out old cruft
...