Timeline issue cleanup