Clean up the page models a bit more.