Cleanup for consumption