add remove function and test ok