trivial: Remove some dead code
Move more functionality out to the update shell file