cleanup mostly Thyme.jl