Further cleaning to get the pages to work.