Revert "Revert "don't remove battd directory""

This reverts commit e762fbe396d13a6cbd83acac4295ce3e46020283.