Add more checks to ensure proper page parts are deleted.