Improve clearing of IDs and ignore really huge atomic blocks