Removed global variables from OTM