fix bundled app and remove old CC calls