Renames PushBlock as Block and removes old code.