Remove workarounds for Scala dep bug