Remove debug code
Match up with new nameing conentions