Remove unused classes from Gen.scala