added remove functionality template