last bit of cleanup