Checkpoint
Remove more legacy
remove duplicate file and add Cache.