Remove CAF part