Cleanup: removes commented-out code from cc_remote