refactoring: Executive class removed because of it's useless