add new ts + cleanup