[setup] continued simplifying/commenting setup code...