Please add a note in comment to remove these in next refactor