Simplify tempest cluster