BlockChecks diff cleanup