Removal of file logging - do not merge to plus