setupblocks should be a branch for 2.0, file removed