Improve workaround for ddc-3160
remove some old experiments