Readded remove functionality