clean-up midway
clean-up. threading remains