Revert "Tech debt reduction"

This reverts commit 7cef577796200237149fd8260952989022f29e5d.
Revert "Tech debt reduction"

This reverts commit 7a6fabd93ecfdebc842db3ab2c88c6ee0cd0f1df.