Get rid of block stuff
Remove test for blocks.'