Do some config changes, get rid of comment section