Remove unused config options
Clarify comments