Merge "Cleaning up reatectrl.c file."