Clean up underscore dependency
Remove underscore