Looks like some page declarations are included twice as part of this clean up?