got remove captures working ... needs cleanup