removed a lot of plotting macro in the end of unfolding