Remove dead code and old debug dumps