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