Remove some debug code
Remove some old code