Removed dead code
Merge branch '4.0'