remove some old code and white space
merge