This is a cleanup commit that fixes a few messy merges by squashing.
Co-authored-by: Jamie Lokier <jamie@shareable.org>
Co-authored-by: Jordan Hrycaj <jordan@status.im>
Co-authored-by: KonradStaniec <konrad.staniec@gmail.com>
Signed-off-by: Jakub Sokołowski <jakub@status.im>