Removing TBS dependencies