Strip some more functionality out; add install_url