Codestyle & remove some dead code
Merge branch 'dev' of github.com:csphere-cms/csphere into dev