Revert "Revert "Till removal""

This reverts commit 100f9ebd4427bad557690c3e4f03f2d2f8e2c459.