Remove useless extra dependency, and pointless method