clean some old code and comments