Extra bit of cleanup