Review fixes, add content pruning