Remove underscore use