Scrappers reorganization, removed comments to debug only, tmbd is ready