Remove relicts
Merge branch '3.0.x'