[Issue-19] RemoveContext now correctly removes the requested context