clear unused code
update test