Cleanup for consumability