Small changes and clean-up for batch defaults. Also removed an unused method

Some basic batch clean up and default changes.