WIP squash - still more cleanup