Remove some debug output and leftover functions