Kill the dead code
New deploy stuff