Merged timeline changes
Removed unnecessary code