Better headers handling in mirroring, removed some superfluous logging