Remove dependency on Scala