refactor(builtin/heq): cleanup universes

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
refactor(builtin/heq): cleanup universes