Clean up from ScalaBlitz