Cleaned out to test for batch