Fixed: #1997 and #1397

Fixed: #1397 Code Cleanup: remove additional keys mechanism  and
Fixed: #1997  Avoid use of then() on promises