Nearly all old settings code removed