better remove functionality