Remove old broken code
Remove debug code