merge timeline and delete some useless code