Remove underscore before variables