various changes before system wipe