back out cancan, minor changes