final bit of cleanup