Train-Driven Development :)
Prune stale pages from the DOM
Merged Kalv's changes