cleanup - remove unused pages
bug fix