Refactoring code: Making volume dict to use single instruction: pop() rather than two instructions: get() and del, giving the codes a format that carries through. Change-Id: Ic889dac330eac24d15bd73186fc504402cddd861 Closes-Bug:#1571548