Revert "fix add logic"

This reverts commit 50715673c767eacf913cd828d35ca11ba992cb41.
Revert "Enhance the Easy Selector"

This reverts commit 8885d3504da6d6b8b83fc52e64af8d460b2d7b59.
Revert "Fix up recipient selector"

This reverts commit bf29c9844151298d907d8045a596b24fecf82138.
Revert "Add Easy Selector"

This reverts commit 35369e694ac5850ecddfc012de9b979cb3e71944.