Remove hardfork merge warnings