Cleanup pages
Merge pull request #292 from igas/cleanup-pages

Cleanup pages