removed all except for logger