* Revert "Build block without checking signatures (#4916)" This reverts commit dc92587b. * Some further clean ups