Build & deployment improvements

More cleanup