Removing dirty page table hack.
Merge branch 'cleanup'