start implementing remove for 0.2