Merge "Remove old comment and unused setting"