Remove message.scala and main update