Revert "[PLAT-6849] Added tests, simplified annuity builders"

This reverts commit 643109e30bd92588549db1ea9655f7b1668b648c.