We have it enabled by default and there are not a lot of reasons to disable it so just remove the option and simplify code