oops
remove redundant val
remove redundant val
remove redundant val
wip minor cleanup
make bin/shell.sh support passing model path in
wip fix regression