Remove unnecessary redirect
refactor CC management