Remove some underscore magic