remove some useless code
Merge branch 'dev-0.2' into webapp