More cleanup - needs some pageshifts

Sending in for review anyways!