Removed all module dependency on direct API calls (all go through TBUtils)