Removing unused templates and fixing the broken BatchProcessor test