remove left-over code