EHash insert and remove operations fixed