StateBlock() cleanup