Add remove functionality