More cleanup to page