Toying with a potential cleanup of blocks