Replace functions 'Dict.get' and 'del' with 'Dict.pop'

Refactoring code: Making 'kwargs' dict to use single instruction: pop()
rather than two instructions: get() and del, giving the codes a format
that carries through.

TrivialFix

Change-Id: Icaf4a57314a8fe48f51993d7b32a1671fec40f31
1 file changed