Fix logger and remove un-needed boiler.