Only try to delete batcher buffers if they were created, minor dependency fix for Makefile