remove functionality fixed