Partial rollback on page.wl, cleanup