Fix blaze body cleanup mechanisms