Merge "Remove unnecessary LOG/CONF statements"