Fix issue with removing conditions/actions