removed old unfolding code;