Do some refactoring and remove some cruft
Lots of refacttoring!