Removed dependency on triv for now, just too early to use that