[Refactoring] Cleanup page.d