rough version of remove done
rough version of remove done