GPII-130: Code clean up.