Refactor/Cleanup: Update features, remove unused pages.