Revert "cleaned deprecated"

This reverts commit 8254ba4dbff07cca3c58d51267fad248a6b33d4a.
Revert "Revert "cleaned deprecated""

This reverts commit 3170739c0bc105a34f008b5c6a25025c22138c39.