remove unused code; valgrind complained about this lazy slop
Merge branch 'master' into debian-master