I think the "SAFE" way to remove your CC info it is on ORIGIN.com since Origin (EA) is where they store all your info!
Just to be sure and safe, I would remove on Both, But I am sure if you remove on Origin 1st, there is no way that EAMYTHIC would charge anything after, since the info is no longer on the main site