Duerer cleanup 0.6