Settings moved to roles file. A bit of cleanup.