Removed FuncExpresssionWrapper + basis for set mocks
Removed old expression helper logic