Remove underscore.js, refactor order pins