Removed FunctionalityTree creation
Removed FunctionalityCalls