moved common state into top
remove supervisor requires which are set elsewhere via require_in
DROP salt-hack
DROP testing code