find and delete fixes