modified to make cleanup optional
add to force option
fixed for find and remove record