Remove debug code, add required namespace