first pass at cleaning out run.sh

Change-Id: I8f3bf5b291c9a4a9b0581a2ef49a16d8013886f7