restored more conservative config handling;
fixed log removal bug on prod. system introduced with commit 5fe55ee