Removing Unneccessary CA code