starting clean-up, seems to work.