Have we done the clearance things yet? I'm guessing it would block merging this into master? I'm a little out of the loop here, but this TODO is worrying.