remove some old definitions which are not used