Remove use of hint in adaptor