Remove superfluous Singletons from scala files