add tmp file removing during batch
corect Lint Warnings