add remove method and test code