remove dead code
cleanup