Better cleaning
Propogation of saved encryption data in change_pages