fix remove functionality issue #23