Use find instead of remove