tidy up unused file
Split out test and batch functionality into separate Dao files
fmt fixes