Additional cleanup for Blockable