Switched out some debug code