Simplify control architecture