[OPTFRA-304] code cleaning