Remove duplicated Timeline constructing
Remove tmp from skelton