Removing all the Apache Commons builders as not needed as using a case class