cleaned some cc stuff per scott request