tests clean-up; unused code removed