added removeEntry and test case