Cleanup for One to many blocks
0.5.4