Removed TBS dependencies from public views