removed old timeline and and small clean up items
new timeline