Remove a couple of modules that made it to jessie
Factor out setup/upgrade code to a function

Just to keep main a bit simpler