Executive / ExecutiveGraph cleanup