Cleanup for new page build