More pruning
Cleanup