[TimeShift] 3rd stage cleanup and recode of timeshift.