Cleanup: removing pageType variable