Remove CPA unused code