remove some old code
remove more old code