One last bit of cleanup