fixed CR
removed old CR stuff