some cleanup, investigating win crash