did a little bit of cleanup