Config cleanup

@mwall another one.