Merge pull request #488 from ecsv/bat-cleanup