[CDE-139] - Removing unreachable return statement