Started implementing remove