timeline fixes. Remove crap