Readded right click to remove functionality