Got rid of 'train wreck' constructor