Remove DeprecatedIn05
Merge pull request #1378 from alex/remove-deprecated

Remove DeprecatedIn05