Removed dependency on underscore until actually needed