clean up Component.scala
merge with repo