little more of cleanup