Since we are moving to angular, remove underscore