Merge "Clean up RKE scripts"