timeline code clean-up