cleans up extra-vars

adds support for from-scratch installs
and leaving services stopped