Remove frequency settings. Fix mkconf.
Merge remote-tracking branch 'origin/master'