various fixes, removes unused pages