Cleanup; remove some redundant code and pages.