some ws pruning, and setting up for more refactoring