Clean up underscore.json

Fixed a couple bugs/dead code and switched to the appropriate underscore methods in some cases