remove functionality working fairly well