remove some old code
codestyle