Remove dependency on thyme