rename
remove batch
cleanup cc @karlfreeman