Merge CSC back into GPE

This will remove the logcat spam, no need to remove CSC from GPE.