1 - Fixed potential leak on private property 'removeWithContextInProgress' 2 - minor code refactor