Merge "remove last traces of copybit"