removed dead code. valgrind-clean.