Fix a bug, remove scratchblocks2