Remove raw type warning