Cleaned up.
Cleaned up.
blocks_map, etc