Merge "Remove unused CONF and LOG"