Remove 'assoc and aget dependency