MAP-781: Remove the remnants of "block structure" from the code base