remove gauge & simplify