Fixed remove functionality