Revert "Some modifications for 0.7 release"

This reverts commit 40d935cdbaaa756c1b085c4639618d665230f266.
version 0.7 patches