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