some cleanup, I think