removing yun / temboo specific functionality