removed @todo because it's done
Remove and Add Helper popovers