Removed Underscore dependency from client