Improved check and delete workflow