Clean up the single-thing hack