Remove warnings for already merged hardfork changes