Remove dependencies on Twitter-util