More cleanup.  Still goes to wrong page.