Revert "Unused changes"

This reverts commit 37614ee58b6a8ac0a0d28e0ec0d446db40d1c5e7.